Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 14 Oct 2011 06:14:17 +0000 (23:14 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 14 Oct 2011 06:14:17 +0000 (23:14 -0700)

Trivial merge